Revision: tla--devo--1.1--patch-56
Archive: miles@gnu.org--gnu-2003
Creator: Miles Bader <miles@gnu.org>
Date: Mon Nov 24 17:21:23 EST 2003
Standard-date: 2003-11-24 22:21:23 GMT
Modified-files: =THANKS ChangeLog libarch/cmd-star-merge.c
    libarch/cmd-undo.c libarch/commit.c libarch/hooks.c
    libarch/invent.c libarch/missing.c libarch/pfs-dav.c
New-patches: lord@emf.net--2003b/tla--devo--1.1--patch-201
    lord@emf.net--2003b/tla--devo--1.1--patch-202
    lord@emf.net--2003b/tla--devo--1.1--patch-203
    lord@emf.net--2003b/tla--devo--1.1--patch-204
    lord@emf.net--2003b/tla--devo--1.1--patch-205
    lord@emf.net--2003b/tla--devo--1.1--patch-206
    lord@emf.net--2003b/tla--devo--1.1--patch-207
    lord@emf.net--2003b/tla--devo--1.1--patch-208
    lord@emf.net--2003b/tla--devo--1.1--patch-209
    miles@gnu.org--gnu-2003/tla--devo--1.1--patch-56
    rbtcollins@hotmail.com--barch/tla--devo--1.1--patch-22
    rbtcollins@hotmail.com--barch/tla--integration--1.1--base-0
    rbtcollins@hotmail.com--barch/tla--integration--1.1--patch-1
    rbtcollins@hotmail.com--barch/tla--integration--1.1--patch-4
    rbtcollins@hotmail.com--barch/tla--integration--1.1--patch-8
    rbtcollins@hotmail.com--barch/tla--integration--1.1--patch-12
    rbtcollins@hotmail.com--barch/tla--integration--1.1--patch-13
    rbtcollins@hotmail.com--barch/tla--integration--1.1--patch-14
    rbtcollins@hotmail.com--barch/tla--integration--1.1--patch-15
    walters@verbum.org--2003/tla--lifeless-integration--1.1--base-0
    walters@verbum.org--2003/tla--lifeless-integration--1.1--patch-1
    walters@verbum.org--2003/tla--mainline--1.1--patch-46
    walters@verbum.org--2003/tla--mainline--1.1--patch-48
    walters@verbum.org--2003/tla--mainline--1.1--patch-49
    walters@verbum.org--2003/tla--mainline--1.1--patch-50
Summary: Merge from Tom

Patches applied:

 * lord@emf.net--2003b/tla--devo--1.1--patch-201
   precommit hook (eric via rbcollins)

 * lord@emf.net--2003b/tla--devo--1.1--patch-202
   fix formatting and warnings re precommit hook

 * lord@emf.net--2003b/tla--devo--1.1--patch-203
   --skip-present bug fix [issue#5414]

 * lord@emf.net--2003b/tla--devo--1.1--patch-204
   http_proxy bugfix (Erik de Castro Lopo + tweaks)

 * lord@emf.net--2003b/tla--devo--1.1--patch-205
   merge walters DAV NULL CWD bugfix - bug 6189

 * lord@emf.net--2003b/tla--devo--1.1--patch-206
   star-merge -- tree-version is default FROM (walters, issue#6539)

 * lord@emf.net--2003b/tla--devo--1.1--patch-207
   fix star-merge arg-parsing bug and formatting

 * lord@emf.net--2003b/tla--devo--1.1--patch-208
   undo can accept just a patch level name (waltes, issue#6541)

 * lord@emf.net--2003b/tla--devo--1.1--patch-209
   add .swp to default backup regexp (walters, vim-friendly, 6540)

 * rbtcollins@hotmail.com--barch/tla--devo--1.1--patch-22
   apply Eric's precommit hook patch

 * rbtcollins@hotmail.com--barch/tla--integration--1.1--base-0
   tag of lord@emf.net--2003b/tla--devo--1.1--patch-198

 * rbtcollins@hotmail.com--barch/tla--integration--1.1--patch-1
   merge in eric's precommit patch

 * rbtcollins@hotmail.com--barch/tla--integration--1.1--patch-4
   apply bug 5414 fix from savannah

 * rbtcollins@hotmail.com--barch/tla--integration--1.1--patch-8
   apply Erik de Castro Lopo's http_proxy bugfix

 * rbtcollins@hotmail.com--barch/tla--integration--1.1--patch-12
   merge walters DAV NULL CWD bugfix - bug 6189

 * rbtcollins@hotmail.com--barch/tla--integration--1.1--patch-13
   merge walters star-merge heuristic to use the current category--branch--version in matching remote archive - bug 6539

 * rbtcollins@hotmail.com--barch/tla--integration--1.1--patch-14
   merge walters undo heuristic to look at the current tree version if handed just a patch-X specifier - bug 6541

 * rbtcollins@hotmail.com--barch/tla--integration--1.1--patch-15
   merge walters .swp file addition to the default backup regex - bug 6540

 * walters@verbum.org--2003/tla--lifeless-integration--1.1--base-0
   tag of rbtcollins@hotmail.com--barch/tla--integration--1.1--patch-14

 * walters@verbum.org--2003/tla--lifeless-integration--1.1--patch-1
   add vim .swp files to default backup regexp

 * walters@verbum.org--2003/tla--mainline--1.1--patch-46
   DAV: use / for cwd if none is set

 * walters@verbum.org--2003/tla--mainline--1.1--patch-48
   add vim ".swp "files to default backup regexp

 * walters@verbum.org--2003/tla--mainline--1.1--patch-49
   star-merge can default to TO revision 

 * walters@verbum.org--2003/tla--mainline--1.1--patch-50
   undo: allow specifying just a patch level

